src/xdisp.c (reseat_at_next_visible_line_start): Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index f2500bd424533011ad6948c84cb79656781ee6c1..26b29320bc2b6f97f3e6a0713dc4ea83c8e5adc1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (reseat_at_next_visible_line_start): Fix last change.
+
 2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix minor problem found by static checking.

diff --git a/src/xdisp.c b/src/xdisp.c
index fbf30092ca175372656d46b7d15a266c8c4571d2..f4e26bf68b6a9b40b99cb754e59d5720a967b3c5 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5812,7 +5812,7 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
   else if (skipped_p)
     {
       reseat (it, it->current.pos, 0);
-      if (it->bidi_p)
+      if (it->bidi_p && !STRINGP (it->string))
        {
          it->bidi_it.new_paragraph = new_paragraph;
          it->bidi_it.first_elt = first_elt;